Updated version 2017.10 from 'upstream/2017.10'
authorSimon McVittie <smcv@debian.org>
Tue, 29 Aug 2017 14:42:16 +0000 (15:42 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 29 Aug 2017 14:42:16 +0000 (15:42 +0100)
with Debian dir 76a68b2f7bf9d0622355ddda0659e539826c2b0d


Trivial merge